Skip to content

exiv2: disable output splitting#97534

Merged
worldofpeace merged 1 commit intoNixOS:masterfrom
timokau:exiv2-no-splitting
Sep 9, 2020
Merged

exiv2: disable output splitting#97534
worldofpeace merged 1 commit intoNixOS:masterfrom
timokau:exiv2-no-splitting

Conversation

@timokau
Copy link
Member

@timokau timokau commented Sep 9, 2020 •
edited
Loading

Motivation for this change

This is a temporary workaround. See the linked comment.

CC @jtojnar, @worldofpeace; Ref #97161

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@timokau
exiv2: disable output splitting
f8f840f 
This is a temporary workaround. See the linked comment.
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Sep 9, 2020
@worldofpeace
Copy link
Contributor

worldofpeace commented Sep 9, 2020

Exiv2/exiv2#1263 was supposed to fix this?

@worldofpeace
Copy link
Contributor

worldofpeace commented Sep 9, 2020

I'm seeing at exiv2Config.cmake

59   │   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"

and IMPORT_PREFIX is out.

I guess we have to sed this like in the postFixup before...

Anyways, I'll defer to @jtojnar since it's his patch.

@timokau
Copy link
Member Author

timokau commented Sep 9, 2020

I would propose to merge this quick fix first. Do you agree?

@worldofpeace
Copy link
Contributor

worldofpeace commented Sep 9, 2020

I would propose to merge this quick fix first. Do you agree?

Oh sure.

@worldofpeace worldofpeace merged commit ca2fd92 into NixOS:master Sep 9, 2020
@jtojnar
Copy link
Member

jtojnar commented Sep 9, 2020

CMake should respect CMAKE_INSTALL_INCLUDEDIR, not sure why this does not happen here and will not be able to debug until tomorrow. Please revert my changes in the meantime.

@timokau timokau deleted the exiv2-no-splitting branch September 9, 2020 17:54
@jtojnar
Copy link
Member

jtojnar commented Sep 10, 2020

The example from #95232 (comment) works for me with nixpkgs changed to this commit reverted. Must be a bug with Digikam.

@jtojnar
Copy link
Member

jtojnar commented Sep 10, 2020

Oh, right, this should actually be ${CMAKE_INSTALL_INCLUDEDIR} https://github.com/Exiv2/exiv2/blob/bb771e5ea9fb1470a47227a040dc6b14274bb77a/src/CMakeLists.txt#L162

@jtojnar
Copy link
Member

jtojnar commented Sep 10, 2020

Opened an upstream PR: Exiv2/exiv2#1294

@jktjkt jktjkt mentioned this pull request Mar 7, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@timokau @worldofpeace @jtojnar